From: Timo Röhling Date: Sun, 28 Jan 2024 13:36:44 +0000 (+0100) Subject: Fix build with imgui 1.90 X-Git-Tag: archive/raspbian/1.9.25+dfsg3-1+rpi1^2~31 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=94130d963285201f93eaa138469b53700b95aa78;p=filament.git Fix build with imgui 1.90 Closes: #1061621 --- diff --git a/debian/patches/0021-Fix-build-with-imgui-1.90.patch b/debian/patches/0021-Fix-build-with-imgui-1.90.patch new file mode 100644 index 0000000..77c4da9 --- /dev/null +++ b/debian/patches/0021-Fix-build-with-imgui-1.90.patch @@ -0,0 +1,21 @@ +From: =?utf-8?q?Timo_R=C3=B6hling?= +Date: Sun, 28 Jan 2024 14:36:13 +0100 +Subject: Fix build with imgui 1.90 + +--- + libs/filagui/src/ImGuiExtensions.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libs/filagui/src/ImGuiExtensions.cpp b/libs/filagui/src/ImGuiExtensions.cpp +index 89b5944..074199a 100644 +--- a/libs/filagui/src/ImGuiExtensions.cpp ++++ b/libs/filagui/src/ImGuiExtensions.cpp +@@ -119,7 +119,7 @@ static void PlotEx(ImGuiPlotType plot_type, const char* label, int series_count, + const ImRect total_bb(frame_bb.Min, frame_bb.Max + ImVec2(label_size.x > 0.0f ? style.ItemInnerSpacing.x + label_size.x : 0.0f, 0)); + ImGui::ItemSize(total_bb, style.FramePadding.y); + if (!ImGui::ItemAdd(total_bb, 0, &frame_bb)) return; +- const bool hovered = ImGui::ItemHoverable(inner_bb, 0); ++ const bool hovered = ImGui::ItemHoverable(inner_bb, 0, 0); + + // Determine scale from values if not specified + if (scale_min == FLT_MAX || scale_max == FLT_MAX) { diff --git a/debian/patches/series b/debian/patches/series index aa9e616..b887976 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -18,3 +18,4 @@ 0018-Fix-compatibility-with-spirv-cross-SDK-1.3.236.patch 0019-Fix-build-with-gcc-13.patch 0020-Do-not-overwrite-debianized-ImportExecutables.patch +0021-Fix-build-with-imgui-1.90.patch